From 22fd786fb1917aa40bf20717ee0cf74916b72eef Mon Sep 17 00:00:00 2001 From: robertl Date: Tue, 19 Aug 2008 19:50:00 +0000 Subject: [PATCH] more CONST-ipation. --- configure | 2 +- configure.in | 2 +- defs.h | 4 +-- filter_vecs.c | 2 +- garmin_tables.c | 14 +++++----- garmin_tables.h | 8 +++--- garmin_txt.c | 4 +-- gbversion.h | 2 +- geoniche.c | 4 +-- internal_styles.c | 70 +++++++++++++++++++++++------------------------ mtk_logger.c | 1 - 11 files changed, 56 insertions(+), 57 deletions(-) diff --git a/configure b/configure index 426b8b87b..8aafe0149 100755 --- a/configure +++ b/configure @@ -1746,7 +1746,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu # Increase GBBUILD for a new release GBBUILD=16 # YYYYMMDD, please, if beta, i.e. "-beta20060413" -PACKAGE_RELEASE="-beta20080807" +PACKAGE_RELEASE="-beta20080811" cat >>confdefs.h <<_ACEOF #define PACKAGE_RELEASE "$PACKAGE_RELEASE" diff --git a/configure.in b/configure.in index d2cfb62c3..f3703ddbb 100644 --- a/configure.in +++ b/configure.in @@ -7,7 +7,7 @@ AC_INIT(GPSBabel, 1.3.5, BUG-REPORT-ADDRESS) # Increase GBBUILD for a new release GBBUILD=16 # YYYYMMDD, please, if beta, i.e. "-beta20060413" -PACKAGE_RELEASE="-beta20080807" +PACKAGE_RELEASE="-beta20080811" AC_DEFINE_UNQUOTED(PACKAGE_RELEASE, "$PACKAGE_RELEASE", [Define to the release name of this package.]) AC_SUBST(PACKAGE_RELEASE) diff --git a/defs.h b/defs.h index 2b5528d0c..4f774cd8b 100644 --- a/defs.h +++ b/defs.h @@ -659,11 +659,11 @@ typedef struct arglist { const char *argstring; char **argval; const char *helpstring; - const char *defaultvalue; + char *defaultvalue; const gbuint32 argtype; const char *minvalue; /* minimum value for numeric options */ const char *maxvalue; /* maximum value for numeric options */ - const char *argvalptr; /* !!! internal helper. Not used in definitions !!! */ + char *argvalptr; /* !!! internal helper. Not used in definitions !!! */ } arglist_t; typedef enum { diff --git a/filter_vecs.c b/filter_vecs.c index f2684eac8..43ed5bac1 100644 --- a/filter_vecs.c +++ b/filter_vecs.c @@ -153,7 +153,7 @@ find_filter_vec(char *const vecname, char **opts) /* step 1: initialize by inifile or default values */ if (vec->vec->args) { for (ap = vec->vec->args; ap->argstring; ap++) { - char *temp; + const char *temp; temp = inifile_readstr(global_opts.inifile, vec->name, ap->argstring); if (temp == NULL) temp = inifile_readstr(global_opts.inifile, "Common filter settings", ap->argstring); diff --git a/garmin_tables.c b/garmin_tables.c index 956612b78..ffff0139e 100644 --- a/garmin_tables.c +++ b/garmin_tables.c @@ -839,7 +839,7 @@ int gt_find_icon_number_from_desc(const char *desc, garmin_formats_e garmin_form return def_icon; } -char * +const char * gt_get_icao_country(const char *cc) { gt_country_code_t *x = >_country_codes[0]; @@ -847,7 +847,7 @@ gt_get_icao_country(const char *cc) if ((cc == NULL) || (*cc == '\0')) return NULL; do { - char *ccx = x->cc; + const char *ccx = x->cc; while (ccx != NULL) { if (strncmp(ccx, cc, 2) == 0) return x->country; if ((ccx[0] == cc[0]) && (ccx[1] == '*')) return x->country; @@ -860,14 +860,14 @@ gt_get_icao_country(const char *cc) return NULL; } -char * +const char * gt_get_icao_cc(const char *country, const char *shortname) { static char res[3]; gt_country_code_t *x = >_country_codes[0]; if ((country == NULL) || (*country == '\0')) { - char *test; + const char *test; if (shortname == NULL) return NULL; switch(strlen(shortname)) { case 3: strncpy(res, shortname, 1); break; @@ -896,7 +896,7 @@ gt_get_icao_cc(const char *country, const char *shortname) return res; } if (shortname && (strlen(shortname) == 4)) { - char *ccx = x->cc; + const char *ccx = x->cc; strncpy(res, shortname, 2); res[2] = '\0'; @@ -930,7 +930,7 @@ gt_lookup_grid_type(const char *grid_name, const char *module) return grid_unknown; /* (warnings) */ } -char * +const char * gt_get_mps_grid_longname(const grid_type grid, const char *module) { if ((grid < GRID_INDEX_MIN) || (grid > GRID_INDEX_MAX)) @@ -940,7 +940,7 @@ gt_get_mps_grid_longname(const grid_type grid, const char *module) return gt_mps_grid_names[grid].longname; } -char * +const char * gt_get_mps_datum_name(const int datum_index) { char *result; diff --git a/garmin_tables.h b/garmin_tables.h index c1a23b5e6..0d2de7734 100644 --- a/garmin_tables.h +++ b/garmin_tables.h @@ -67,8 +67,8 @@ typedef struct gt_country_code_s extern gt_country_code_t gt_country_codes[]; -char *gt_get_icao_country(const char *cc); -char *gt_get_icao_cc(const char *country, const char *shortname); +const char *gt_get_icao_country(const char *cc); +const char *gt_get_icao_cc(const char *country, const char *shortname); /* this order is used by most devices */ typedef enum { @@ -93,9 +93,9 @@ unsigned char gt_convert_category(const char *name, int *category); unsigned char gt_switch_display_mode_value(const unsigned char display_mode, const int protoid, const char device); grid_type gt_lookup_grid_type(const char *grid_name, const char *module); -char *gt_get_mps_grid_longname(const grid_type grid, const char *module); +const char *gt_get_mps_grid_longname(const grid_type grid, const char *module); int gt_lookup_datum_index(const char *datum_str, const char *module); -char *gt_get_mps_datum_name(const int datum_index); +const char *gt_get_mps_datum_name(const int datum_index); gbuint32 gt_color_value(const int garmin_index); gbuint32 gt_color_value_by_name(const char *name); int gt_color_index_by_name(const char *name); diff --git a/garmin_txt.c b/garmin_txt.c index e17a9a6fc..545c024e5 100644 --- a/garmin_txt.c +++ b/garmin_txt.c @@ -511,7 +511,7 @@ write_waypt(const waypoint *wpt) garmin_fs_p gmsd; char *wpt_type; char *dspl_mode; - char *country; + const char *country; double x; int i, icon, dynamic; char *icon_descr; @@ -780,7 +780,7 @@ garmin_txt_write(void) cet_gbfprintf(fout, &cet_cs_vec_cp1252, "Grid\t%s\r\n", grid_str); xfree(grid_str); - datum_str = gt_get_mps_datum_name(datum_index); + const char *datum_str = gt_get_mps_datum_name(datum_index); gbfprintf(fout, "Datum\t%s\r\n\r\n", datum_str); waypoints = 0; diff --git a/gbversion.h b/gbversion.h index 66a82b5ef..72e53c255 100644 --- a/gbversion.h +++ b/gbversion.h @@ -4,5 +4,5 @@ * * Isn't simplification via automation grand? */ -#define VERSION "1.3.5-beta20080807" +#define VERSION "1.3.5-beta20080811" #define WEB_DOC_DIR "http://www.gpsbabel.org/htmldoc-development" diff --git a/geoniche.c b/geoniche.c index 205d5847d..9b19b3313 100644 --- a/geoniche.c +++ b/geoniche.c @@ -413,10 +413,10 @@ static const char *geoniche_icon_map[] = /* MPS */ /* 52 */ "Mystery or puzzle Cache", }; -static char * +static const char * geoniche_icon_to_descr(const int no) { - char *result = NULL; + const char *result = NULL; if (no >= 0x21) { diff --git a/internal_styles.c b/internal_styles.c index 8f8f16460..32578b445 100644 --- a/internal_styles.c +++ b/internal_styles.c @@ -1075,6 +1075,40 @@ static char tomtom_itn[] = "IFIELD SHORTNAME, \"\", \"%s\"\n" "IFIELD CONSTANT, \"0\", \"%s\"\n" ; +static char xmap[] = +"# gpsbabel XCSV style file\n" +"#\n" +"# Format: DeLorme Xmap Conduit\n" +"# Author: Alex Mottram\n" +"# Date: 12/09/2002\n" +"#\n" +"# \n" +"# As defined in csv.c/xmap\n" +"#\n" + +"DESCRIPTION DeLorme XMap HH Native .WPT\n" +"EXTENSION wpt\n" + +"#\n" +"# FILE LAYOUT DEFINITIIONS:\n" +"#\n" +"FIELD_DELIMITER COMMASPACE\n" +"RECORD_DELIMITER NEWLINE\n" +"BADCHARS COMMA\n" + +"PROLOGUE BEGIN SYMBOL\n" +"EPILOGUE END\n" +"#\n" +"# INDIVIDUAL DATA FIELDS, IN ORDER OF APPEARANCE:\n" +"#\n" +"IFIELD LAT_HUMAN_READABLE, \"\", \"%08.5f\"\n" +"IFIELD LON_HUMAN_READABLE, \"\", \"%08.5f\"\n" +"IFIELD DESCRIPTION, \"\", \"%s\"\n" + +"OFIELD LAT_DECIMAL, \"\", \"%08.5f\"\n" +"OFIELD LON_DECIMAL, \"\", \"%08.5f\"\n" +"OFIELD DESCRIPTION, \"\", \"%s\"\n" +; static char xmap2006[] = "# gpsbabel XCSV style file\n" "#\n" @@ -1113,40 +1147,6 @@ static char xmap2006[] = -; -static char xmap[] = -"# gpsbabel XCSV style file\n" -"#\n" -"# Format: DeLorme Xmap Conduit\n" -"# Author: Alex Mottram\n" -"# Date: 12/09/2002\n" -"#\n" -"# \n" -"# As defined in csv.c/xmap\n" -"#\n" - -"DESCRIPTION DeLorme XMap HH Native .WPT\n" -"EXTENSION wpt\n" - -"#\n" -"# FILE LAYOUT DEFINITIIONS:\n" -"#\n" -"FIELD_DELIMITER COMMASPACE\n" -"RECORD_DELIMITER NEWLINE\n" -"BADCHARS COMMA\n" - -"PROLOGUE BEGIN SYMBOL\n" -"EPILOGUE END\n" -"#\n" -"# INDIVIDUAL DATA FIELDS, IN ORDER OF APPEARANCE:\n" -"#\n" -"IFIELD LAT_HUMAN_READABLE, \"\", \"%08.5f\"\n" -"IFIELD LON_HUMAN_READABLE, \"\", \"%08.5f\"\n" -"IFIELD DESCRIPTION, \"\", \"%s\"\n" - -"OFIELD LAT_DECIMAL, \"\", \"%08.5f\"\n" -"OFIELD LON_DECIMAL, \"\", \"%08.5f\"\n" -"OFIELD DESCRIPTION, \"\", \"%s\"\n" ; static char xmapwpt[] = "# gpsbabel XCSV style file\n" @@ -1180,7 +1180,7 @@ static char xmapwpt[] = "IFIELD IGNORE, \"\", \"%-.31s\"\n" "IFIELD DESCRIPTION, \"\", \"%-.78s\"\n" ; -style_vecs_t style_list[] = {{ "xmapwpt", xmapwpt } , { "xmap", xmap } , { "xmap2006", xmap2006 } , { "tomtom_itn", tomtom_itn } , { "tomtom_asc", tomtom_asc } , { "tabsep", tabsep } , { "sportsim", sportsim } , { "saplus", saplus } , { "s_and_t", s_and_t } , { "openoffice", openoffice } , { "nima", nima } , { "navigonwpt", navigonwpt } , { "mxf", mxf } , { "mapconverter", mapconverter } , { "kwf2", kwf2 } , { "ktf2", ktf2 } , { "kompass_wp", kompass_wp } , { "kompass_tk", kompass_tk } , { "iblue747", iblue747 } , { "gpsman", gpsman } , { "gpsdrivetrack", gpsdrivetrack } , { "gpsdrive", gpsdrive } , { "geonet", geonet } , { "garmin_poi", garmin_poi } , { "garmin301", garmin301 } , { "fugawi", fugawi } , { "dna", dna } , { "custom", custom } , { "cup", cup } , { "csv", csv } , { "cambridge", cambridge } , { "arc", arc } , {0,0}}; +style_vecs_t style_list[] = {{ "xmapwpt", xmapwpt } , { "xmap2006", xmap2006 } , { "xmap", xmap } , { "tomtom_itn", tomtom_itn } , { "tomtom_asc", tomtom_asc } , { "tabsep", tabsep } , { "sportsim", sportsim } , { "saplus", saplus } , { "s_and_t", s_and_t } , { "openoffice", openoffice } , { "nima", nima } , { "navigonwpt", navigonwpt } , { "mxf", mxf } , { "mapconverter", mapconverter } , { "kwf2", kwf2 } , { "ktf2", ktf2 } , { "kompass_wp", kompass_wp } , { "kompass_tk", kompass_tk } , { "iblue747", iblue747 } , { "gpsman", gpsman } , { "gpsdrivetrack", gpsdrivetrack } , { "gpsdrive", gpsdrive } , { "geonet", geonet } , { "garmin_poi", garmin_poi } , { "garmin301", garmin301 } , { "fugawi", fugawi } , { "dna", dna } , { "custom", custom } , { "cup", cup } , { "csv", csv } , { "cambridge", cambridge } , { "arc", arc } , {0,0}}; size_t nstyles = 32; #else /* CSVFMTS_ENABLED */ style_vecs_t style_list[] = {{0,0}}; diff --git a/mtk_logger.c b/mtk_logger.c index e056d6477..42e4edb53 100644 --- a/mtk_logger.c +++ b/mtk_logger.c @@ -626,7 +626,6 @@ static int add_trackpoint(int idx, unsigned long bmask, struct data_item *itm){ if ( bmask & (1<altitude = itm->height; - // WAYPT_SET(trk, altitude, itm->height); } trk->creation_time = itm->timestamp; // in UTC.. if ( bmask & (1<